From bb3a6214cbeaa3211be007192e536bd473323836 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 May 2023 21:21:39 -0400 Subject: [PATCH] tests: Stop copying the tool tests No point in doing that, and the meson feature we are using here is deprecated. --- testsuite/tools/meson.build | 8 ++------ testsuite/tools/{settings.in => settings} | 0 testsuite/tools/{simplify.in => simplify} | 0 testsuite/tools/{simplify-3to4.in => simplify-3to4} | 0 testsuite/tools/{validate.in => validate} | 0 5 files changed, 2 insertions(+), 6 deletions(-) rename testsuite/tools/{settings.in => settings} (100%) rename testsuite/tools/{simplify.in => simplify} (100%) rename testsuite/tools/{simplify-3to4.in => simplify-3to4} (100%) rename testsuite/tools/{validate.in => validate} (100%) diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 986c2d6dcc..96ac7fda06 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -3,12 +3,8 @@ if bash.found() test_env = environment() foreach t : ['simplify', 'simplify-3to4', 'validate', 'settings'] - configure_file(output: t, - input: '@0@.in'.format(t), - copy: true, - ) - test(t, bash, - args: t, + test(t, + find_program(t, dirs: meson.current_source_dir()), workdir: meson.current_build_dir(), protocol: 'tap', env: [ diff --git a/testsuite/tools/settings.in b/testsuite/tools/settings similarity index 100% rename from testsuite/tools/settings.in rename to testsuite/tools/settings diff --git a/testsuite/tools/simplify.in b/testsuite/tools/simplify similarity index 100% rename from testsuite/tools/simplify.in rename to testsuite/tools/simplify diff --git a/testsuite/tools/simplify-3to4.in b/testsuite/tools/simplify-3to4 similarity index 100% rename from testsuite/tools/simplify-3to4.in rename to testsuite/tools/simplify-3to4 diff --git a/testsuite/tools/validate.in b/testsuite/tools/validate similarity index 100% rename from testsuite/tools/validate.in rename to testsuite/tools/validate -- 2.30.2